meson: Use build_rpath instead of custom linker args

Meson now warns when specifying the rpath in linker flags instead
of using the newly added build_rpath option - now that we already
depend on the latest release, there's no reason anyway to not use
the nicer syntax.

https://bugzilla.gnome.org/show_bug.cgi?id=786343

diff --git a/src/meson.build b/src/meson.build
index 5f12fbc9d9c08d54390658993d8689712e4738db..1e88bf5d51ca609c778ec8f23982569ee5173d42 100644 (file)
--- a/src/meson.build
+++ b/src/meson.build
@@ -37,7 +37,6 @@ gnome_shell_cflags = [
   '-DGNOME_SHELL_PKGLIBDIR="@0@"'.format(pkglibdir)
 ]
 
-rpath_link_args = ['-Wl,-rpath', mutter_typelibdir]
 install_rpath = ':'.join([mutter_typelibdir, pkglibdir])
 
 gnome_shell_deps = [
@@ -81,7 +80,7 @@ libshell_menu = library('gnome-shell-menu',
   sources: libshell_menu_gir_sources + libshell_menu_no_gir_sources,
   dependencies: [gio_dep, clutter_dep],
   include_directories: conf_inc,
-  link_args: rpath_link_args,
+  build_rpath: mutter_typelibdir,
   install_rpath: mutter_typelibdir,
   install_dir: pkglibdir,
   install: true
@@ -214,7 +213,7 @@ libshell = library('gnome-shell',
   include_directories: [conf_inc, st_inc, include_directories('tray')],
   c_args: gnome_shell_cflags,
   link_with: [libtray],
-  link_args: rpath_link_args,
+  build_rpath: mutter_typelibdir,
   install_rpath: install_rpath,
   install_dir: pkglibdir,
   install: true
@@ -256,7 +255,7 @@ executable('gnome-shell', 'main.c',
   ],
   dependencies: gnome_shell_deps + [libshell_dep, libst_dep, mutter_dep],
   include_directories: [conf_inc, st_inc, include_directories('tray')],
-  link_args: rpath_link_args,
+  build_rpath: mutter_typelibdir,
   install_rpath: install_rpath,
   install: true
 )
@@ -266,7 +265,7 @@ executable('gnome-shell-extension-prefs',
   c_args: gnome_shell_cflags,
   dependencies: gnome_shell_deps,
   include_directories: [conf_inc],
-  link_args: rpath_link_args,
+  build_rpath: mutter_typelibdir,
   install_rpath: install_rpath,
   install: true
 )
@@ -278,7 +277,7 @@ if have_networkmanager
     c_args: gnome_shell_cflags,
     dependencies: gnome_shell_deps,
     include_directories: [conf_inc],
-    link_args: rpath_link_args,
+    build_rpath: mutter_typelibdir,
     install_rpath: install_rpath,
     install_dir: libexecdir,
     install: true
@@ -288,7 +287,7 @@ endif
 executable('gnome-shell-perf-helper', 'shell-perf-helper.c',
   dependencies: [gtk_dep, gio_dep, m_dep],
   include_directories: [conf_inc],
-  link_args: rpath_link_args,
+  build_rpath: mutter_typelibdir,
   install_rpath: install_rpath,
   install_dir: libexecdir,
   install: true
@@ -298,5 +297,5 @@ executable('run-js-test', 'run-js-test.c',
   dependencies: [mutter_dep, gio_dep, gjs_dep],
   include_directories: [conf_inc],
   link_with: libshell,
-  link_args: rpath_link_args
+  build_rpath: mutter_typelibdir,
 )